This pull request updates the main branch with changes from the master branch in the upstream repository.

⚠️ Merge Conflicts Detected

The automatic merge from upstream encountered conflicts in the following files:

• 3DPARTY.md
• 3d-party-lic-report/json2md.js
• Common/config/default.json
• Common/config/schemas/config.schema.json
• Common/sources/commondefines.js
• Common/sources/constants.js
• Common/sources/documentFormats.js
• Common/sources/formatchecker.js
• Common/sources/license.js
• Common/sources/logger.js
• Common/sources/mailService.js
• Common/sources/moduleReloader.js
• Common/sources/notificationService.js
• Common/sources/operationContext.js
• Common/sources/runtimeConfigManager.js
• Common/sources/statsdclient.js
• Common/sources/storage/storage-base.js
• Common/sources/storage/storage-fs.js
• Common/sources/storage/storage-s3.js
• Common/sources/taskqueueRabbitMQ.js
• Common/sources/tenantManager.js
• Common/sources/utils.js
• DocService/npm-shrinkwrap.json
• DocService/package.json
• DocService/sources/DocsCoServer.js
• DocService/sources/ai/aiProxyHandler.js
• DocService/sources/canvasservice.js
• DocService/sources/changes2forgotten.js
• DocService/sources/converterservice.js
• DocService/sources/database.js
• DocService/sources/databaseConnectors/baseConnector.js
• DocService/sources/databaseConnectors/connectorUtilities.js
• DocService/sources/editorDataMemory.js
• DocService/sources/fileuploaderservice.js
• DocService/sources/gc.js
• DocService/sources/pubsubRabbitMQ.js
• DocService/sources/routes/meta.js
• DocService/sources/routes/static.js
• DocService/sources/server.js
• DocService/sources/shutdown.js
• DocService/sources/taskresult.js
• DocService/sources/utilsDocService.js
• DocService/sources/wopiClient.js
• DocService/sources/wopiUtils.js
• FileConverter/sources/converter.js
• FileConverter/sources/convertermaster.js
• FileConverter/sources/signing/pdfAwsKmsSigner.js
• FileConverter/sources/signing/pdfCscSigner.js
• FileConverter/sources/signing/pdfSigningCore.js
• Gruntfile.js
• LICENSE.txt
• Metrics/config/config.js
• SpellChecker/sources/languages.js
• SpellChecker/sources/server.js
• SpellChecker/sources/spellCheck.js
• package.json
• tests/env-setup.js
• tests/integration/withServerInstance/forgottenFilesCommnads.tests.js
• tests/integration/withServerInstance/storage.tests.js
• tests/jest.config.js
• tests/perf/checkFileExpire.js
• tests/unit/pdfSigning.tests.js
• tests/unit/sample.tests.js
• tests/unit/utils.tests.js
• tests/unit/utilsDocService.tests.js

Action Required

• Manually merge the upstream branch to inspect and resolve the conflicts:

  git fetch upstream master
  git checkout update-from-master
  git merge upstream/master
  # Resolve conflicts, then:
  git add .
  git commit
  git push origin update-from-master